Handle mid-gstring face changes

* src/xdisp.c (fill_gstring_glyph_string): Don't extend the glyph
string past face changes.  (Bug#41454)

diff --git a/src/xdisp.c b/src/xdisp.c
index f65c3ebcd2f05bc607a1ac7fead5bb56e78e7fec..327e8a183b1322417c8832aaaff7d635e7bb97ca 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -27706,6 +27706,7 @@ fill_gstring_glyph_string (struct glyph_string *s, int face_id,
   while (glyph < last
         && glyph->u.cmp.automatic
         && glyph->u.cmp.id == s->cmp_id
+        && glyph->face_id == face_id
         && s->cmp_to == glyph->slice.cmp.from)
     {
       s->width += glyph->pixel_width;